From 5a3691352d723852da210b3e9cfd2e4c6da72a18 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 4 Aug 2008 10:33:02 +0000 Subject: [PATCH] avoid our own deprecated public API and use 2008-08-04 Michael Natterer * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_font): avoid our own deprecated public API and use gtk_font_selection_get_font_internal() instead of gtk_font_selection_get_font(). (gtk_font_selection_get_font) (gtk_font_selection_dialog_get_font): Add missing "Deprecated: 2.0" to the api doc comments. svn path=/trunk/; revision=20962 --- ChangeLog | 11 +++++++++++ gtk/gtkfontsel.c | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4d5b56dc5..3a5ae3cc90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-08-04 Michael Natterer + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_font): + avoid our own deprecated public API and use + gtk_font_selection_get_font_internal() instead of + gtk_font_selection_get_font(). + + (gtk_font_selection_get_font) + (gtk_font_selection_dialog_get_font): Add missing + "Deprecated: 2.0" to the api doc comments. + 2008-08-04 Michael Natterer * gdk/tests/Makefile.am: add the generated PNGs to CLEANFILES. diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 97dbcab908..a4a8141025 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1314,14 +1314,16 @@ gtk_font_selection_get_size (GtkFontSelection *fontsel) /** * gtk_font_selection_get_font: * @fontsel: a #GtkFontSelection - * - * Return value: A #GdkFont. + * + * Return value: A #GdkFont. + * + * Deprecated: 2.0: Use gtk_font_selection_get_font_name() instead. **/ GdkFont * gtk_font_selection_get_font (GtkFontSelection *fontsel) { g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL); - + return gtk_font_selection_get_font_internal (fontsel); } @@ -1709,13 +1711,15 @@ gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd) * * Return value: the #GdkFont from the #GtkFontSelection for the * currently selected font in the dialog. + * + * Deprecated: 2.0: Use gtk_font_selection_dialog_get_font_name() instead. */ GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd) { g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL); - return gtk_font_selection_get_font (GTK_FONT_SELECTION (fsd->fontsel)); + return gtk_font_selection_get_font_internal (GTK_FONT_SELECTION (fsd->fontsel)); } /** -- 2.30.2